Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lua: add back Darwin makeBinaryWrapper fix #194389

Merged
merged 1 commit into from
Oct 9, 2022
Merged

Conversation

stephank
Copy link
Contributor

@stephank stephank commented Oct 4, 2022

Description of changes

It looks like #187934 broke the fix from #172749, see discussion in #189582 (comment).

Tested on master.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.11 Release Notes (or backporting 22.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@Artturin
Copy link
Member

Artturin commented Oct 4, 2022

I had intended to move it from the override to the wrapper.nix so splicing will work correctly, but I forgot to add it there.

@stephank
Copy link
Contributor Author

stephank commented Oct 4, 2022

An argument was made here to keep it as an override: #172749 (comment)

@doronbehar doronbehar requested a review from teto October 8, 2022 14:35
@teto teto merged commit 2623fc4 into NixOS:staging Oct 9, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants